(smerge-start-session): Add interactive spec.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 545cd8f9ab96d553b4cc0936719f9ffc802dbd6a..dc567340c44372d1da7416d53d85832bd1a7001b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-02  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+       * smerge-mode.el (smerge-start-session): Add interactive spec.
+
 2009-02-02  Glenn Morris  <rgm@gnu.org>
 
        * mail/rmail.el (rmail-ignored-headers, rmail-displayed-headers)

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 05e0445f76c3033f679b837a1b1305c71561dac1..a942d09c6a09a861122d2b31d99290ff0b91caa8 100644 (file)
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -1222,6 +1222,7 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict."
 (defun smerge-start-session ()
   "Turn on `smerge-mode' and move point to first conflict marker.
 If no conflict maker is found, turn off `smerge-mode'."
+  (interactive)
   (smerge-mode 1)
   (condition-case nil
       (unless (looking-at smerge-begin-re)